clang tidy fixes (#1214)

* fix tidy readability-named-parameter

* fix readability-named-parameter fix

* fix some readability-inconsistent-declaration-parameter-name tidy warnings.

* update tidy script to

ignore strptime
ignore third party headers
clean build directory
generate summary

* update git ignores

diff --git a/.gitignore b/.gitignore
index 6d7d77f6902f371470706d270cde59c6a4b3d23d..d0e84069e783300e3bb7d28c0fda92bb5e2fb9c1 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -19,7 +19,12 @@
 /autom4te.cache/
 /babelweb/
 /bld/
+/bld-clazy/
+/bld-sanitizeaddress/
+/bld-sanitizeundefined/
+/bld-tidy/
 /build/
+/codacy-clang-tidy
 /compile_commands.json
 /config.h
 /config.log
@@ -45,6 +50,7 @@
 /out/
 /qrc_gpsbabel.cpp
 /release/
+/run-clang-tidy-nocolor
 /tmp/
 CMakeCache.txt
 CMakeFiles/

diff --git a/arcdist.cc b/arcdist.cc
index 55a33c887b0fbc2eaafbf417ad2a11b617c70b11..5f56b8ca48e4a620367a57a3e7b60d8fcb9c2608 100644 (file)
--- a/arcdist.cc
+++ b/arcdist.cc
@@ -106,7 +106,7 @@ void ArcDistanceFilter::arcdist_arc_disp_wpt_cb(const Waypoint* arcpt2)
   arcpt1 = arcpt2;
 }
 
-void ArcDistanceFilter::arcdist_arc_disp_hdr_cb(const route_head*)
+void ArcDistanceFilter::arcdist_arc_disp_hdr_cb(const route_head* /*unused*/)
 {
   /* Set arcpt1 to NULL */
   arcdist_arc_disp_wpt_cb(nullptr);

diff --git a/arcdist.h b/arcdist.h
index 842fb12f43e63ef11fbff006f9c0534e488de47b..2458ffc9edabab074dec95aac73c3deefd0f48a7 100644 (file)
--- a/arcdist.h
+++ b/arcdist.h
@@ -54,7 +54,7 @@ private:
   /* Member Functions */
 
   void arcdist_arc_disp_wpt_cb(const Waypoint* arcpt2);
-  void arcdist_arc_disp_hdr_cb(const route_head*);
+  void arcdist_arc_disp_hdr_cb(const route_head* /*unused*/);
 
   /* Data Members */
 

diff --git a/defs.h b/defs.h
index 1ab8517999303915606d04773b3ac91d66c65e8a..99e3a54bcd09072c24d10ef5e5cd126e129a6280 100644 (file)
--- a/defs.h
+++ b/defs.h
@@ -326,7 +326,7 @@ public:
   Waypoint();
   ~Waypoint();
   Waypoint(const Waypoint& other);
-  Waypoint& operator=(const Waypoint& other);
+  Waypoint& operator=(const Waypoint& rhs);
 
   /* Member Functions */
 
@@ -927,8 +927,8 @@ struct ff_vecs_t {
 // This can have a large effect on codacy issues from cppcheck
 // nullPointerRedundantCheck, nullPointerArithmeticRedundantCheck,
 // negativeIndex, arrayIndexOutOfBoundsCond.
-[[gnu::format(printf, 1, 2)]] [[noreturn]] void fatal(const char*, ...);
-[[gnu::format(printf, 1, 2)]] void warning(const char*, ...);
+[[gnu::format(printf, 1, 2)]] [[noreturn]] void fatal(const char* fmt, ...);
+[[gnu::format(printf, 1, 2)]] void warning(const char* fmt, ...);
 
 void printposn(double c, bool is_lat);
 

diff --git a/dg-100.h b/dg-100.h
index 12c609712edf33cac4882c991515382ac7a77279..346ea5ff4982ebc290cb5298fb11a089ec132a52 100644 (file)
--- a/dg-100.h
+++ b/dg-100.h
@@ -126,8 +126,8 @@ protected:
   void dg100_getfiles() const;
   int dg100_erase() const;
   void common_rd_init(const QString& fname);
-  void dg100_rd_init(const QString& fname, bool isfile);
-  void dg200_rd_init(const QString& fname, bool isfile);
+  void dg100_rd_init(const QString& fname, bool is_file);
+  void dg200_rd_init(const QString& fname, bool is_file);
 
   /* Data Members */
 

diff --git a/garmin.cc b/garmin.cc
index f6fd25dd6b4b4d37f0633d25796305c0a43fccb4..c8ab8f234dc80648dbc96ec45f059938848b7a2a 100644 (file)
--- a/garmin.cc
+++ b/garmin.cc
@@ -408,7 +408,7 @@ rw_deinit()
 }
 
 static int
-waypt_read_cb(int total_ct, GPS_PWay*)
+waypt_read_cb(int total_ct, GPS_PWay* /*unused*/)
 {
   if (global_opts.verbose_status) {
     static int i;
@@ -485,7 +485,7 @@ waypt_read()
   }
 }
 
-static int lap_read_nop_cb(int, GPS_SWay**)
+static int lap_read_nop_cb(int /*unused*/, GPS_SWay** /*unused*/)
 {
   return 0;
 }
@@ -812,7 +812,7 @@ sane_GPS_Way_New()
 }
 
 static int
-waypt_write_cb(GPS_PWay*)
+waypt_write_cb(GPS_PWay* /*unused*/)
 {
   int n = waypt_count();
 

diff --git a/garmin_txt.cc b/garmin_txt.cc
index 62efa8d601753350c88d51d9e9665689d46a8ce0..f7b1575fd5ff3f6732f74a114260c2fb21ad41fa 100644 (file)
--- a/garmin_txt.cc
+++ b/garmin_txt.cc
@@ -245,13 +245,13 @@ enum_waypt_cb(const Waypoint* wpt)
 /* common route and track pre-work */
 
 static void
-prework_hdr_cb(const route_head*)
+prework_hdr_cb(const route_head* /*unused*/)
 {
   cur_info = &route_info[route_idx];
 }
 
 static void
-prework_tlr_cb(const route_head*)
+prework_tlr_cb(const route_head* /*unused*/)
 {
   cur_info->last_wpt = cur_info->prev_wpt;
   route_idx++;
@@ -615,7 +615,7 @@ route_disp_hdr_cb(const route_head* rte)
 }
 
 static void
-route_disp_tlr_cb(const route_head*)
+route_disp_tlr_cb(const route_head* /*unused*/)
 {
   route_idx++;
 }
@@ -670,7 +670,7 @@ track_disp_hdr_cb(const route_head* track)
 }
 
 static void
-track_disp_tlr_cb(const route_head*)
+track_disp_tlr_cb(const route_head* /*unused*/)
 {
   route_idx++;
 }

diff --git a/geo.h b/geo.h
index ae1197702e2af46f84fadb8d36d642d3944bd7d6..96b31f492c9726a3bf49c3cf0224415b59d763ba 100644 (file)
--- a/geo.h
+++ b/geo.h
@@ -61,8 +61,8 @@ private:
   /* Member Functions */
 
   static void GeoReadLoc(QXmlStreamReader& reader);
-  void geo_waypt_pr(const Waypoint*, QXmlStreamWriter& writer);
-  static Geocache::container_t wpt_container(const QString&);
+  void geo_waypt_pr(const Waypoint* waypointp, QXmlStreamWriter& writer);
+  static Geocache::container_t wpt_container(const QString& args);
 
   /* Data Members */
 

diff --git a/igc.h b/igc.h
index e08963e85fa20176e05ca673d32839ffae5fab8f..51019a3483530d137d029597ffd85f8da1b90600 100644 (file)
--- a/igc.h
+++ b/igc.h
@@ -236,7 +236,7 @@ private:
   class TaskRecordReader
   {
   public:
-    void igc_task_rec(const char*);
+    void igc_task_rec(const char* rec);
 
   private:
     enum class state_t { id, takeoff, start, turnpoint, finish, landing };
@@ -251,7 +251,7 @@ private:
   class Interpolater
   {
   public:
-    double interpolate_alt(const route_head*, const gpsbabel::DateTime&);
+    double interpolate_alt(const route_head* track, const gpsbabel::DateTime& time);
 
   private:
     std::optional<WaypointList::const_iterator> prev_wpt;
@@ -267,23 +267,23 @@ private:
 
   /* Member Functions */
 
-  static bool coords_match(double, double, double, double);
-  igc_rec_type_t get_record(char**) const;
-  void detect_pres_track(const route_head*);
-  void detect_gnss_track(const route_head*);
-  void detect_other_track(const route_head*, int& max_waypt_ct);
-  void get_tracks(const route_head**, const route_head**);
-  static QByteArray latlon2str(const Waypoint*);
-  static QByteArray date2str(const gpsbabel::DateTime&);
-  static QByteArray tod2str(const gpsbabel::DateTime&);
+  static bool coords_match(double lat1, double lon1, double lat2, double lon2);
+  igc_rec_type_t get_record(char** rec) const;
+  void detect_pres_track(const route_head* rh);
+  void detect_gnss_track(const route_head* rh);
+  void detect_other_track(const route_head* rh, int& max_waypt_ct);
+  void get_tracks(const route_head** pres_track, const route_head** gnss_track);
+  static QByteArray latlon2str(const Waypoint* wpt);
+  static QByteArray date2str(const gpsbabel::DateTime& dt);
+  static QByteArray tod2str(const gpsbabel::DateTime& tod);
   void wr_header();
-  void wr_task_wpt_name(const Waypoint*, const char*);
-  void wr_task_hdr(const route_head*, unsigned int task_num);
-  void wr_task_wpt(const Waypoint*);
-  void wr_task_tlr(const route_head*);
+  void wr_task_wpt_name(const Waypoint* wpt, const char* alt_name);
+  void wr_task_hdr(const route_head* rte, unsigned int task_num);
+  void wr_task_wpt(const Waypoint* wpt);
+  void wr_task_tlr(const route_head* rte);
   void wr_tasks();
-  void wr_fix_record(const Waypoint*, int, int);
-  static int correlate_tracks(const route_head*, const route_head*);
+  void wr_fix_record(const Waypoint* wpt, int pres_alt, int gnss_alt);
+  static int correlate_tracks(const route_head* pres_track, const route_head* gnss_track);
   void wr_track();
 
   /* Data Members */

diff --git a/jeeps/garminusb.h b/jeeps/garminusb.h
index 5fd0136ace23f44977c7a654d86454932f8cb3d4..5e968d655fa2ca8ba010982018b523eab9b02b5f 100644 (file)
--- a/jeeps/garminusb.h
+++ b/jeeps/garminusb.h
@@ -60,7 +60,7 @@ extern garmin_unit_info_t garmin_unit_info[GUSB_MAX_UNITS];
 int gusb_cmd_send(const garmin_usb_packet* obuf, size_t sz);
 int gusb_cmd_get(garmin_usb_packet* ibuf, size_t sz);
 int gusb_init(const char* portname, gpsdevh** dh);
-int gusb_close(gpsdevh*, bool exit_lib = true);
+int gusb_close(gpsdevh* dh, bool exit_lib = true);
 
 /*
  * New packet types in USB.

diff --git a/jeeps/gpsapp.cc b/jeeps/gpsapp.cc
index 914b7e1c69a7047fb80a4de4b9c39d73f74aaeb3..95e487629c64ac994dd0cd6cb95267d688b98cbb 100644 (file)
--- a/jeeps/gpsapp.cc
+++ b/jeeps/gpsapp.cc
@@ -3657,7 +3657,7 @@ static void GPS_D210_Send(UC* data, GPS_PWay way, int32* len)
 **
 ** @return [int32] number of track entries
 ************************************************************************/
-int32 GPS_A300_Get(const char* port , GPS_PTrack** trk, pcb_fn)
+int32 GPS_A300_Get(const char* port , GPS_PTrack** trk, pcb_fn /*unused*/)
 {
   static UC data[2];
   gpsdevh* fd;
@@ -6131,7 +6131,7 @@ int32 GPS_A800_On(const char* port, gpsdevh** fd)
 **
 ** @return [int32] success
 ************************************************************************/
-int32 GPS_A800_Off(const char*, gpsdevh** fd)
+int32 GPS_A800_Off(const char* /*unused*/, gpsdevh** fd)
 {
   static UC data[2];
   GPS_PPacket tra;
@@ -6590,7 +6590,7 @@ int32  GPS_A1006_Get
 **
 ** @return [int32] success
 ************************************************************************/
-int32 GPS_A1006_Send(const char*,
+int32 GPS_A1006_Send(const char* /*unused*/,
                      GPS_PCourse* crs,
                      int32 n_crs,
                      gpsdevh* fd)
@@ -6825,7 +6825,7 @@ int32 GPS_A1007_Get(const char* port, GPS_PCourse_Lap** clp, pcb_fn cb)
 **
 ** @return [int32] success
 ************************************************************************/
-int32 GPS_A1007_Send(const char*,
+int32 GPS_A1007_Send(const char* /*unused*/,
                      GPS_PCourse_Lap* clp,
                      int32 n_clp,
                      gpsdevh* fd)
@@ -7096,7 +7096,7 @@ int32 GPS_A1008_Get(const char* port, GPS_PCourse_Point** cpt, pcb_fn cb)
 **
 ** @return [int32] success
 ************************************************************************/
-int32 GPS_A1008_Send(const char*,
+int32 GPS_A1008_Send(const char* /*unused*/,
                      GPS_PCourse_Point* cpt,
                      int32 n_cpt,
                      gpsdevh* fd)

diff --git a/jeeps/gpslibusb.cc b/jeeps/gpslibusb.cc
index 752379d72d6cd145dc0a3193d46581b64163b06f..80e6f0f1d28be14f1c34300291682b6512ce2c40 100644 (file)
--- a/jeeps/gpslibusb.cc
+++ b/jeeps/gpslibusb.cc
@@ -66,7 +66,7 @@ static unsigned char gusb_bulk_in_ep;
 
 static bool libusb_successfully_initialized{false};
 static libusb_device_handle* udev{nullptr};
-static int garmin_usb_scan(libusb_unit_data*, int);
+static int garmin_usb_scan(libusb_unit_data* lud, int req_unit_number);
 
 static int gusb_libusb_get(garmin_usb_packet* ibuf, size_t sz);
 static int gusb_libusb_get_bulk(garmin_usb_packet* ibuf, size_t sz);

diff --git a/jeeps/gpsusbcommon.h b/jeeps/gpsusbcommon.h
index df07c4ae532f9c5685205ee30dfffc9c0e48cb6d..8b29d4040b7257db55fcaaf771e9819bc611fa76 100644 (file)
--- a/jeeps/gpsusbcommon.h
+++ b/jeeps/gpsusbcommon.h
@@ -37,7 +37,7 @@ typedef struct gusb_llops {
 
 /* Provided by the common code. */
 void gusb_syncup();
-void gusb_register_ll(gusb_llops*);
+void gusb_register_ll(gusb_llops* p);
 void gusb_list_units();
 
 /* Provided by the OS layers */

diff --git a/jeeps/gpsusbread.cc b/jeeps/gpsusbread.cc
index 97bb7c035f5466da6e624c9780680cf597760cce..e6e10062df5b30e7cb333507af3c8c96a8eef7b6 100644 (file)
--- a/jeeps/gpsusbread.cc
+++ b/jeeps/gpsusbread.cc
@@ -28,7 +28,7 @@
  * Negative on error.
  * 1 if read success - even if empty packet.
  */
-int32 GPS_Packet_Read_usb(gpsdevh*, GPS_PPacket* packet, int eat_bulk)
+int32 GPS_Packet_Read_usb(gpsdevh* /*unused*/, GPS_PPacket* packet, int eat_bulk)
 {
   int32  n;
   int32 payload_size;

diff --git a/jeeps/gpsusbsend.cc b/jeeps/gpsusbsend.cc
index 04ac456fa514b11f0c22bdab07e071229bc9a651..030776587889a48f3756e9a89351626364b61175 100644 (file)
--- a/jeeps/gpsusbsend.cc
+++ b/jeeps/gpsusbsend.cc
@@ -26,7 +26,7 @@
 #include <cstdio>
 
 int32
-GPS_Write_Packet_usb(gpsdevh*, GPS_PPacket& packet)
+GPS_Write_Packet_usb(gpsdevh* /*unused*/, GPS_PPacket& packet)
 {
   garmin_usb_packet gp;
   memset(&gp, 0, sizeof(gp));

diff --git a/lowranceusr.cc b/lowranceusr.cc
index 6a06e1322b38e21e39d07e51fbe36caf82adb13a..37201990f43e2dbf88d9a51791aa5d14db7b659c 100644 (file)
--- a/lowranceusr.cc
+++ b/lowranceusr.cc
@@ -1678,7 +1678,7 @@ LowranceusrFormat::lowranceusr4_route_leg_disp(const Waypoint* wpt) const
 }
 
 void
-LowranceusrFormat::lowranceusr4_route_trl(const route_head*) const
+LowranceusrFormat::lowranceusr4_route_trl(const route_head* /*unused*/) const
 {
   /* Mystery byte */
   gbfputc(0x01, file_out);     // end of Route info ??
@@ -1731,7 +1731,7 @@ LowranceusrFormat::lowranceusr_merge_trail_hdr(const route_head* trk)
 }
 
 void
-LowranceusrFormat::lowranceusr_merge_trail_tlr(const route_head*)
+LowranceusrFormat::lowranceusr_merge_trail_tlr(const route_head* /*unused*/)
 {
   if (trail_count == (int)track_count()) {  /* last trail */
     short num_trail_points = trail_point_count;
@@ -1753,7 +1753,7 @@ LowranceusrFormat::lowranceusr_merge_trail_tlr(const route_head*)
   }
 }
 void
-LowranceusrFormat::lowranceusr_merge_trail_hdr_2(const route_head*)
+LowranceusrFormat::lowranceusr_merge_trail_hdr_2(const route_head* /*unused*/)
 {
   continuous = 0;
 }

diff --git a/lowranceusr.h b/lowranceusr.h
index 51b4dbeed78e0f95ee6735347b3ff4740d42b7a8..efeb6e310e36b2af150df142e031213980b0215f 100644 (file)
--- a/lowranceusr.h
+++ b/lowranceusr.h
@@ -385,50 +385,50 @@ private:
 
   /* Member Functions */
 
-  static bool same_points(const Waypoint*, const Waypoint*);
-  void register_waypt(const Waypoint*) const;
-  static const Waypoint* lowranceusr4_find_waypt(uint, int, int);
-  static const Waypoint* lowranceusr4_find_global_waypt(uint, uint, uint, uint);
-  QString lowranceusr4_readstr(gbfile*, int) const;
-  void lowranceusr4_writestr(const QString&, gbfile*, int) const;
-  static gpsbabel::DateTime lowranceusr4_get_timestamp(unsigned int, unsigned int);
-  static Lowranceusr4Timestamp lowranceusr4_jd_from_timestamp(const gpsbabel::DateTime&);
-  static QString lowranceusr_find_desc_from_icon_number(int);
-  static int lowranceusr_find_icon_number_from_desc(const QString&);
-  static QString lowranceusr4_find_desc_from_icon_number(int);
-  static int lowranceusr4_find_icon_number_from_desc(const QString&);
-  static const char* lowranceusr4_find_color_from_icon_number_plus_color_index(int, int);
-  static int lowranceusr4_find_index_from_icon_desc_and_color_desc(const QString&, const QString&);
-  static double lon_mm_to_deg(double);
-  static double lat_mm_to_deg(double);
-  static long int lon_deg_to_mm(double);
-  static long int lat_deg_to_mm(double);
-  void lowranceusr_parse_waypt(Waypoint*, int) const;
-  void lowranceusr4_parse_waypt(Waypoint*) const;
+  static bool same_points(const Waypoint* A, const Waypoint* B);
+  void register_waypt(const Waypoint* wpt) const;
+  static const Waypoint* lowranceusr4_find_waypt(uint uid_unit, int uid_seq_low, int uid_seq_high);
+  static const Waypoint* lowranceusr4_find_global_waypt(uint id1, uint id2, uint id3, uint id4);
+  QString lowranceusr4_readstr(gbfile* file, int bytes_per_char) const;
+  void lowranceusr4_writestr(const QString& buf, gbfile* file, int bytes_per_char) const;
+  static gpsbabel::DateTime lowranceusr4_get_timestamp(unsigned int jd_number, unsigned int msecs);
+  static Lowranceusr4Timestamp lowranceusr4_jd_from_timestamp(const gpsbabel::DateTime& qdt);
+  static QString lowranceusr_find_desc_from_icon_number(int icon);
+  static int lowranceusr_find_icon_number_from_desc(const QString& desc);
+  static QString lowranceusr4_find_desc_from_icon_number(int icon);
+  static int lowranceusr4_find_icon_number_from_desc(const QString& desc);
+  static const char* lowranceusr4_find_color_from_icon_number_plus_color_index(int icon, int index);
+  static int lowranceusr4_find_index_from_icon_desc_and_color_desc(const QString& icon, const QString& color);
+  static double lon_mm_to_deg(double x);
+  static double lat_mm_to_deg(double x);
+  static long int lon_deg_to_mm(double x);
+  static long int lat_deg_to_mm(double x);
+  void lowranceusr_parse_waypt(Waypoint* wpt_tmp, int object_num_present) const;
+  void lowranceusr4_parse_waypt(Waypoint* wpt_tmp) const;
   void lowranceusr_parse_waypts() const;
   void lowranceusr_parse_route() const;
   void lowranceusr4_parse_route() const;
   void lowranceusr_parse_routes();
   void lowranceusr_parse_icons() const;
-  void lowranceusr_parse_trail(int*);
-  void lowranceusr4_parse_trail(int*) const;
+  void lowranceusr_parse_trail(int* trail_num);
+  void lowranceusr4_parse_trail(int* trail_num) const;
   void lowranceusr_parse_trails();
-  void lowranceusr_waypt_disp(const Waypoint*) const;
-  void lowranceusr4_waypt_disp(const Waypoint*);
-  void lowranceusr_waypt_pr(const Waypoint*);
+  void lowranceusr_waypt_disp(const Waypoint* wpt) const;
+  void lowranceusr4_waypt_disp(const Waypoint* wpt);
+  void lowranceusr_waypt_pr(const Waypoint* wpt);
   void lowranceusr4_write_waypoints();
-  void lowranceusr_write_icon(const Waypoint*) const;
-  void lowranceusr_trail_hdr(const route_head*);
-  void lowranceusr_route_hdr(const route_head*);
-  void lowranceusr4_route_hdr(const route_head*);
-  void lowranceusr4_route_leg_disp(const Waypoint*) const;
-  void lowranceusr4_route_trl(const route_head*) const;
-  void lowranceusr_trail_disp(const Waypoint*);
-  void lowranceusr_merge_trail_hdr(const route_head*);
-  void lowranceusr_merge_trail_tlr(const route_head*);
-  void lowranceusr_merge_trail_hdr_2(const route_head*);
-  void lowranceusr4_trail_hdr(const route_head*);
-  void lowranceusr4_trail_disp(const Waypoint*) const;
+  void lowranceusr_write_icon(const Waypoint* wpt) const;
+  void lowranceusr_trail_hdr(const route_head* trk);
+  void lowranceusr_route_hdr(const route_head* rte);
+  void lowranceusr4_route_hdr(const route_head* rte);
+  void lowranceusr4_route_leg_disp(const Waypoint* wpt) const;
+  void lowranceusr4_route_trl(const route_head* /*unused*/) const;
+  void lowranceusr_trail_disp(const Waypoint* wpt);
+  void lowranceusr_merge_trail_hdr(const route_head* trk);
+  void lowranceusr_merge_trail_tlr(const route_head* /*unused*/);
+  void lowranceusr_merge_trail_hdr_2(const route_head* /*unused*/);
+  void lowranceusr4_trail_hdr(const route_head* trail);
+  void lowranceusr4_trail_disp(const Waypoint* wpt) const;
 
   /* Data Members */
 

diff --git a/random.cc b/random.cc
index 339c0460234f5dcbad0c1b14c975f0fde63f9954..b0e8033d0eff5cdc2f4f5bcfc14a57d50d80d6e5 100644 (file)
--- a/random.cc
+++ b/random.cc
@@ -87,7 +87,7 @@ RandomFormat::random_set_generator()
 }
 
 void
-RandomFormat::rd_init(const QString&)
+RandomFormat::rd_init(const QString& /*unused*/)
 {
   random_set_generator();
 }
@@ -239,7 +239,7 @@ RandomFormat::read()
 }
 
 void
-RandomFormat::rd_position_init(const QString&)
+RandomFormat::rd_position_init(const QString& /*unused*/)
 {
   random_set_generator();
   realtime = new realtime_data;

diff --git a/random.h b/random.h
index 3f392e3bd86829bc80d2459b3584d0feb80cf74f..d9ace300597332ace29b102feb0952c796317ec7 100644 (file)
--- a/random.h
+++ b/random.h
@@ -73,12 +73,12 @@ private:
 
   /* Member Functions */
 
-  double rand_dbl(double);
-  float rand_flt(float);
-  int rand_int(int);
-  QString rand_str(int, const char*);
+  double rand_dbl(double max);
+  float rand_flt(float max);
+  int rand_int(int max);
+  QString rand_str(int maxlen, const char* fmt);
   void random_set_generator();
-  Waypoint* random_generate_wpt(int, const QDateTime&, const Waypoint*);
+  Waypoint* random_generate_wpt(int i, const QDateTime& time, const Waypoint* prev);
 
   /* Data Members */
 

diff --git a/rgbcolors.cc b/rgbcolors.cc
index fbb2e12ea60e2705c2391909b3e3e50da50375a1..a82fa3f8b02d211ccff140a7d6fe157f4773c99b 100644 (file)
--- a/rgbcolors.cc
+++ b/rgbcolors.cc
@@ -219,31 +219,31 @@ static int HexByte(const char* hex)
  */
 
 int
-color_to_bbggrr(const char* opt_color)
+color_to_bbggrr(const char* cname)
 {
   char* ep;
 
-  int color_num = strtol(opt_color, &ep, 10);
+  int color_num = strtol(cname, &ep, 10);
 
-  if (ep != opt_color) {
+  if (ep != cname) {
     return color_num;
   }
 
-  if (opt_color[0] == '#') {
-    color_num = (HexByte(opt_color+1)) +      // red
-                (HexByte(opt_color+3)<<8) +   // green
-                (HexByte(opt_color+5)<<16);   // blue
+  if (cname[0] == '#') {
+    color_num = (HexByte(cname+1)) +      // red
+                (HexByte(cname+3)<<8) +   // green
+                (HexByte(cname+5)<<16);   // blue
     return color_num;
   }
 
   for (auto i : color_table) {
-    if (0 == case_ignore_strcmp(opt_color, i.cn)) {
+    if (0 == case_ignore_strcmp(cname, i.cn)) {
       return (i.b << 16) +
              (i.g << 8) +
               i.r;
     }
   }
 
-  fatal("unrecognized color name %s\n", opt_color);
+  fatal("unrecognized color name %s\n", cname);
   return -1;
 }

diff --git a/src/core/usasciicodec.h b/src/core/usasciicodec.h
index db002278c95f7f631a112adb93aedb819c400eb6..b6e32f9223d6c935f7e4efc9cfb24fa5046a55fd 100644 (file)
--- a/src/core/usasciicodec.h
+++ b/src/core/usasciicodec.h
@@ -31,8 +31,8 @@ public:
   QByteArray name() const override;
   QList<QByteArray> aliases() const override;
   int mibEnum() const override;
-  QString convertToUnicode(const char*, int, ConverterState*) const override;
-  QByteArray convertFromUnicode(const QChar*, int, ConverterState*) const override;
+  QString convertToUnicode(const char* chars, int len, ConverterState* state) const override;
+  QByteArray convertFromUnicode(const QChar* uc, int len, ConverterState* state) const override;
 };
 
 } // namespace gpsbabel

diff --git a/tools/ci_run_tidy.sh b/tools/ci_run_tidy.sh
index 6d0eff7e42fa315b9b2df6142a1e55deb7af9715..856fc3cfdbbe31f6fad5b6f555aa727bc1c88c3b 100755 (executable)
--- a/tools/ci_run_tidy.sh
+++ b/tools/ci_run_tidy.sh
@@ -5,8 +5,9 @@ COMMIT=$(git log -1 --format='%H')
 CODACY_CLANG_TIDY=$(curl -s https://api.github.com/repos/codacy/codacy-clang-tidy/releases/latest | jq '.assets[] | select(.name|startswith("codacy-clang-tidy-linux-")) | .browser_download_url' | tr -d \")
 
 CHECKS="clang-diagnostic-*,clang-analyzer-*,cppcoreguidelines-*,modernize-*,bugprone-*,google-*,misc-*,performance-*,readability-*,-cppcoreguidelines-pro-type-vararg,-modernize-use-trailing-return-type,-readability-identifier-length"
-HEADERFILTER=".*"
+HEADERFILTER="$(pwd)/[^/]*\.h|$(pwd)/jeeps/[^/]*\.h|$(pwd)/src/core/[^/]*\.h|$(pwd)/gui/[^/]*\.h|gbversion\.h"
 
+rm -fr bld-tidy
 mkdir bld-tidy
 cd bld-tidy
 cmake -G Ninja -DCMAKE_BUILD_TYPE=Release -DGPSBABEL_ENABLE_PCH=OFF -DCMAKE_EXPORT_COMPILE_COMMANDS=ON ..
@@ -15,7 +16,7 @@ cmake --build .
 cd ..
 
 # exclude third party library source
-jq '[.[]|select(.file|contains("zlib")|not)] | [.[]|select(.file|contains("shapelib")|not)] | [.[]|select(.file|contains("bld-tidy")|not)]' \
+jq '[.[]|select(.file|contains("zlib")|not)] | [.[]|select(.file|contains("shapelib")|not)] | [.[]|select(.file|contains("strptime")|not)] | [.[]|select(.file|contains("bld-tidy")|not)]' \
 bld-tidy/compile_commands.json \
 > compile_commands.json
 
@@ -26,6 +27,8 @@ chmod +x run-clang-tidy-nocolor
 ./run-clang-tidy-nocolor -p "$(pwd)" -header-filter "${HEADERFILTER}" -checks "${CHECKS}" | \
 tee tidy.out
 
+grep warning: tidy.out | sed 's/.*\[/[/' | sort | uniq -c | sort | tee tidy.summary
+
 curl -L "${CODACY_CLANG_TIDY}" --output codacy-clang-tidy
 chmod +x codacy-clang-tidy
 

diff --git a/validate.cc b/validate.cc
index 50d4b0ef3fcddd612579ee123cf8a1a486b51f34..23cf30b815009471caacd6e69488d9b97984f1c7 100644 (file)
--- a/validate.cc
+++ b/validate.cc
@@ -27,7 +27,7 @@
 #if FILTERS_ENABLED
 #define MYNAME "validate"
 
-void ValidateFilter::validate_head(const route_head*)
+void ValidateFilter::validate_head(const route_head* /*unused*/)
 {
   head_ct += 1;
   segment_ct_start = point_ct;
@@ -44,7 +44,7 @@ void ValidateFilter::validate_head_trl(const route_head* header)
   }
 }
 
-void ValidateFilter::validate_point(const Waypoint*)
+void ValidateFilter::validate_point(const Waypoint* /*unused*/)
 {
   point_ct += 1;
 }

diff --git a/validate.h b/validate.h
index ad47720fb06edd8889c6d81536aa99c71c696379..eff779d5ce3533c338d01429b59c7d25cbed7727 100644 (file)
--- a/validate.h
+++ b/validate.h
@@ -59,9 +59,9 @@ private:
     },
   };
 
-  void validate_head(const route_head*);
+  void validate_head(const route_head* /*unused*/);
   void validate_head_trl(const route_head* header);
-  void validate_point(const Waypoint*);
+  void validate_point(const Waypoint* /*unused*/);
 
 };